diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index 9cc70aa..8fb53e7 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -49,13 +49,29 @@
 /**
  * Hash encode a string
  *
+ * This is simply an alias for do_hash()
+ * dohash() is now deprecated
+ */
+if ( ! function_exists('dohash'))
+{	
+	function dohash($str, $type = 'sha1')
+	{
+		return $this->do_hash($str, $type);
+	}
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Hash encode a string
+ *
  * @access	public
  * @param	string
  * @return	string
  */	
-if ( ! function_exists('dohash'))
+if ( ! function_exists('do_hash'))
 {	
-	function dohash($str, $type = 'sha1')
+	function do_hash($str, $type = 'sha1')
 	{
 		if ($type == 'sha1')
 		{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index a941904..e61961b 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -70,6 +70,7 @@
 	<li>Helpers
 		<ul>
 			<li>Added accept-charset to the list of inserted attributes of <kbd>form_open()</kbd> in the <a href="helpers/form_helper.html">Form Helper</a>.</li>
+			<li>Deprecated the <kbd>dohash()</kbd> function in favour of <kbd>do_hash()</kbd> for naming consistency.</li>
 		</ul>
 	</li>
 </ul>
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index 5732cb7..dfc813c 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -75,16 +75,17 @@
 <a href="../libraries/input.html">Input class</a>.  More info can be found there.</p>
 
 
-<h2>dohash()</h2>
+<h2>do_hash()</h2>
 
 <p>Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords.  Will create SHA1 by default. Examples:</p>
 
 <code>
-$str = dohash($str); // SHA1<br />
+$str = do_hash($str); // SHA1<br />
 <br />
-$str = dohash($str, 'md5'); // MD5
+$str = do_hash($str, 'md5'); // MD5
 </code>
 
+<p class="important"><strong>Note:</strong>  This function was formerly named <kbd>dohash()</kbd>, which has been deprecated in favour of <kbd>do_hash()</kbd>.</p>